Merge: Fix minor problems found by static checking (Bug#9031).
authorPaul Eggert <eggert@cs.ucla.edu>
Sun, 10 Jul 2011 05:12:16 +0000 (22:12 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Sun, 10 Jul 2011 05:12:16 +0000 (22:12 -0700)

Trivial merge